Merge "master" into "ovn".
authorJustin Pettit <jpettit@nicira.com>
Thu, 7 May 2015 23:52:06 +0000 (16:52 -0700)
committerJustin Pettit <jpettit@nicira.com>
Thu, 7 May 2015 23:52:06 +0000 (16:52 -0700)
commitf2d371f7f6e765d8e97a3bd31fffa8197bd45fe2
tree06ed5bd8c1c0fa2f6d9add596c6efe0f0ef94228
parente387e3e885222651f11a23c401e9e27fca3362ef
parent88c98bf5635c732d4c77e5314ec7440a08a09dec
Merge "master" into "ovn".

This brings in STT.

Conflicts:
tutorial/ovs-sandbox
AUTHORS
configure.ac
tests/automake.mk
tests/testsuite.at
tutorial/ovs-sandbox