release: 2.2.0-beta.1

Author: locao

kong-2.2.0alpha.1-0.rockspec renamed to kong-2.2.0beta.1-0.rockspec

@@ -1,17 +1,9 @@
 package = "kong"
-<<<<<<< HEAD:kong-2.2.0alpha.1-0.rockspec
-version = "2.2.0alpha.1-0"
+version = "2.2.0beta.1-0"
 supported_platforms = {"linux", "macosx"}
 source = {
   url = "git://github.com/Kong/kong",
-  tag = "2.2.0-alpha.1"
-=======
-version = "2.1.4-0"
-supported_platforms = {"linux", "macosx"}
-source = {
-  url = "git://github.com/Kong/kong",
-  tag = "2.1.4"
->>>>>>> next:kong-2.1.4-0.rockspec
+  tag = "2.2.0-beta.1"
 }
 description = {
   summary = "Kong is a scalable and customizable API Management Layer built on top of Nginx.",

kong/meta.lua

@@ -2,7 +2,7 @@ local version = setmetatable({
   major = 2,
   minor = 2,
   patch = 0,
-  suffix = "alpha.1"
+  suffix = "beta.1"
 }, {
   -- our Makefile during certain releases adjusts this line. Any changes to
   -- the format need to be reflected in both places