tree d00100ee81b72417e2a87033f9dbf654312835fe
parent e8e4535e3c51b061bc93317df10f3a767af29212
parent ade0b09aabb5de6add855056c0182384b78f67a0
author Ayaka Koshibe <ayaka@onlab.us> 1413482232 -0700
committer Ayaka Koshibe <ayaka@onlab.us> 1413482232 -0700

Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

Conflicts:
	core/store/serializers/src/main/java/org/onlab/onos/store/serializers/KryoPoolUtil.java

Change-Id: I6a8fc884f0c0b6578762d7b439177378e838735f