Merge branch 'cmaster-next' into vtysh-grammar

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Conflicts:
	bgpd/bgp_encap.c
	bgpd/bgp_route.c
	lib/command.c
	lib/command.h
	ospf6d/ospf6d.c
	vtysh/vtysh.c

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/json.c b/lib/json.c
index 1d22180e10..966d24f005 100644
--- a/lib/json.c
+++ b/lib/json.c
@@ -55,6 +55,12 @@ json_object_int_add(struct json_object* obj, const char *key, int32_t i)
 }
 
 void
+json_object_long_add(struct json_object* obj, const char *key, int64_t i)
+{
+  json_object_object_add(obj, key, json_object_new_int64(i));
+}
+
+void
 json_object_boolean_false_add(struct json_object* obj, const char *key)
 {
   json_object_object_add(obj, key, json_object_new_boolean(0));