Merge pull request #160 from DenverM80/master_merge_3_2

Merge 3_2_autogen into master

Author: rpmoore

docker/run_docker.rb

@@ -16,7 +16,7 @@
 end
 
 # List all users
-response = connection.get("/users")
+response = connection.get("/api/users")
 # All GET responses are under a root "data"
 users = JSON.parse(response.body)["data"]
 
@@ -29,7 +29,7 @@
 # make a separate "/s3v/keys" request which is setup to return an array
 # of DS3 authid/secretkey pairs in case we ever allow more than one pair per
 # user.
-response = connection.get("/ds3/keys?user_id=#{spectra_user["id"]}")
+response = connection.get("/api/ds3/keys?user_id=#{spectra_user["id"]}")
 spectra_user_keys = JSON.parse(response.body)["data"][0]
 abort("Spectra User Keys not found.") if spectra_user.keys.nil?
 

src/Makefile.am

@@ -4,5 +4,5 @@ include_HEADERS = ds3.h ds3_string_multimap.h ds3_net.h ds3_request.h ds3_utils.
 libds3_la_SOURCES = ds3.c ds3_string_multimap.c ds3_net.c ds3_string_multimap_impl.c ds3_string.c ds3_utils.c ds3_connection.c
 libds3_la_CFLAGS = $(LIBXML2_CFLAGS) $(GLIB2_CFLAGS) $(LIBCURL_CFLAGS) -Wall
 libds3_la_LIBADD = $(LIBXML2_LIBS) $(GLIB2_LIBS) $(LIBCURL_LIBS)
-libds3_la_LDFLAGS = -version-info 3:0:0
+libds3_la_LDFLAGS = -version-info 3:2:0