Merge branch 'redhawk-2.2' into 'master'

B. Thomas Goodwin · B. Thomas Goodwin · commit 875a07a820e2 · 2018-11-27T12:32:10.000-05:00
REDHAWK 2.2

See merge request geon/docker-redhawk!8
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 #
 
-VERSION := $(or $(VERSION), $(VERSION), 2.0.8)
+VERSION := $(or $(VERSION), $(VERSION), 2.2.0)
 
 image_prefix := geontech/redhawk
 base := $(image_prefix)-base

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`# along with this program. If not, see http://www.gnu.org/licenses/.`
`18`	`18`	`#`
`19`	`19`
`20`		`-VERSION := $(or $(VERSION), $(VERSION), 2.0.8)`
	`20`	`+VERSION := $(or $(VERSION), $(VERSION), 2.2.0)`
`21`	`21`
`22`	`22`	`image_prefix := geontech/redhawk`
`23`	`23`	`base := $(image_prefix)-base`