From 4baaca86f9964c0290718a27e95926ef9ee723ee Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Fri, 10 Oct 2014 07:08:27 -0700
Subject: [PATCH] Allow System properties to override configuration

Fixes #15.
---
 src/main/java/org/gaul/s3proxy/S3Proxy.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/gaul/s3proxy/S3Proxy.java b/src/main/java/org/gaul/s3proxy/S3Proxy.java
index 86ce9fe..162d26c 100644
--- a/src/main/java/org/gaul/s3proxy/S3Proxy.java
+++ b/src/main/java/org/gaul/s3proxy/S3Proxy.java
@@ -103,6 +103,7 @@ public final class S3Proxy {
         try (InputStream is = new FileInputStream(new File(args[1]))) {
             properties.load(is);
         }
+        properties.putAll(System.getProperties());
 
         String provider = properties.getProperty(Constants.PROPERTY_PROVIDER);
         String identity = properties.getProperty(Constants.PROPERTY_IDENTITY);