From 7cb1989a834c0d98103e3b783838df5ec0baa375 Mon Sep 17 00:00:00 2001
From: Bob-The-Marauder <nickadams_98@yahoo.com>
Date: Sun, 7 Apr 2019 13:57:51 +0000
Subject: [PATCH] Riak CS 2.1.2 Final - `make` to `${MAKE}` for FreeBSD

---
 Makefile         | 14 +++++++-------
 RELEASE-NOTES.md |  6 ++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 641dcabd7..a89353338 100644
--- a/Makefile
+++ b/Makefile
@@ -84,13 +84,13 @@ pulse: all
 test-client: test-clojure test-boto test-ceph test-erlang test-ruby test-php test-go
 
 test-python:
-	@cd client_tests/python/ && make CS_HTTP_PORT=$(CS_HTTP_PORT)
+	@cd client_tests/python/ && ${MAKE} CS_HTTP_PORT=$(CS_HTTP_PORT)
 
 test-boto:
-	@cd client_tests/python/ && make boto_tests CS_HTTP_PORT=$(CS_HTTP_PORT)
+	@cd client_tests/python/ && ${MAKE} boto_tests CS_HTTP_PORT=$(CS_HTTP_PORT)
 
 test-ceph:
-	@cd client_tests/python/ && make ceph_tests CS_HTTP_PORT=$(CS_HTTP_PORT)
+	@cd client_tests/python/ && ${MAKE} ceph_tests CS_HTTP_PORT=$(CS_HTTP_PORT)
 
 test-ruby:
 	@bundle --gemfile client_tests/ruby/Gemfile --path vendor
@@ -105,10 +105,10 @@ test-clojure:
 	@cd client_tests/clojure/clj-s3 && lein do deps, midje
 
 test-php:
-	@cd client_tests/php && make
+	@cd client_tests/php && ${MAKE}
 
 test-go:
-	@cd client_tests/go && make
+	@cd client_tests/go && ${MAKE}
 
 ##
 ## Release targets
@@ -171,7 +171,7 @@ package.src: deps
 	rm -rf package/$(PKG_ID)
 	git archive --format=tar --prefix=$(PKG_ID)/ $(PKG_REVISION)| (cd package && tar -xf -)
 	cp pkg.vars.config package/$(PKG_ID)
-	make -C package/$(PKG_ID) deps
+	${MAKE} -C package/$(PKG_ID) deps
 	mkdir -p package/$(PKG_ID)/priv
 	git --git-dir=.git describe --tags >package/$(PKG_ID)/priv/vsn.git
 	for dep in package/$(PKG_ID)/deps/*; do \
@@ -186,7 +186,7 @@ dist: package.src
 	cp package/$(PKG_ID).tar.gz .
 
 package: package.src
-	make -C package -f $(PKG_ID)/deps/node_package/Makefile
+	${MAKE} -C package -f $(PKG_ID)/deps/node_package/Makefile
 
 pkgclean: distclean
 	rm -rf package
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 7ea8ff1a8..d3530e791 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,6 +1,6 @@
-#Riak CS 2.1.2 Release Candidate Notes
+#Riak CS 2.1.2 Release Notes
 
-Released February 24, 2019.
+Released April 7, 2019.
 
 This is a backwards-compatible* release that updates node_package to address a recent [Product Advisory](http://docs.basho.com/riak/latest/community/product-advisories/codeinjectioninitfiles/), as well as fixes several bugs.
 
@@ -16,9 +16,11 @@ During the update to 2.1.2, a '==' omitted upload ID might be passed to a Riak C
 
 ##Changes
 * For s3cmd users, experimental signature_v4 support has been made available through a simple on/off toggle in riak-cs.conf. With a default setting of "off", it allows in-situ upgrades without the need to change s3cfg files until after all nodes have been upgraded. Note: this function is currently unfinished and suffers from compatibility issues with some clients ([#1058](https://github.com/basho/riak_cs/issues/1058) / [#1060](https://github.com/basho/riak_cs/issues/1060)) and one potential security issue ([#1059](https://github.com/basho/riak_cs/issues/1059)
+* Experimental support for Leveled (the alternative to LevelDB to be released with Riak KV 2.9) has been successfully tested with the Riak KV 2.9.0 Release Candidates.
 * Due to a recent [Product Advisory](http://docs.basho.com/riak/latest/community/product-advisories/codeinjectioninitfiles/), node_package was bumped to version 3.0.0 to prevent a potential code injection on the riak init file. [[Issue 1297](https://github.com/basho/riak_cs/issues/1297), [PR 1306](https://github.com/basho/riak_cs/pull/1306), & [PR 109](https://github.com/basho/stanchion/pull/109)]
 * Multipart upload IDs no longer contain trailing '=' characters, which caused trouble for some clients. This change also makes upload IDs URL-safe. [[PR 1316](https://github.com/basho/riak_cs/pull/1316)]
 * When Riak is unavailable due to network partition or node being offline, a 500 error is returned. [[PR 1298](https://github.com/basho/riak_cs/pull/1298)]
+* Switched from `make` to `${MAKE}` to facilitate easier building on FreeBSD and related platforms
 
 ## Bugs Fixed