From 02686b6dcfc06b9d8da65dcfa9acbbc9d0292b0b 2016-12-03 21:45:28
From: Branko Majic <branko@majic.rs>
Date: 2016-12-03 21:45:28
Subject: [PATCH] MAR-84: Preparing for release 1.2.0. Updated years in copyright notices.

---

diff --git a/LICENSE b/LICENSE
index c27aabe93d4d9a54880bcaaa40ee09b1c9c95db3..095715a90d44a424dc38ca441e5ccbd8c633d2a1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014, Branko Majic
+Copyright (c) 2016, Branko Majic
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/docs/about.rst b/docs/about.rst
index aa87b8e0dfd100f982b3c6b6de010be2b08eb25c..04987c383b974bd1023297523bf45c9f7bc719c8 100644
--- a/docs/about.rst
+++ b/docs/about.rst
@@ -108,7 +108,7 @@ License
 
 Majic Ansible Roles is released under terms of *BSD (3-Clause) License*::
 
-  Copyright (c) 2015, Branko Majic
+  Copyright (c) 2016, Branko Majic
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without modification,
diff --git a/docs/conf.py b/docs/conf.py
index 8efbb5dfc1bcbbaa09a40cea866fd2f456647b10..f740cd319a7bb5b417cf7eed642723c2526c9c48 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -44,16 +44,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Majic Ansible Roles'
-copyright = u'2014, Branko Majic'
+copyright = u'2016, Branko Majic'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.1-dev'
+version = '1.2.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.1-dev'
+release = '1.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst
index 8e89585c402b6b8bfd50464087129754f878951d..a5d4d74d28bf993682b606584ed01ca849637296 100644
--- a/docs/releasenotes.rst
+++ b/docs/releasenotes.rst
@@ -2,6 +2,31 @@ Release notes
 =============
 
 
+1.2.0
+-----
+
+Minor fixes and features.
+
+New features:
+
+* ``wsgi_website`` role
+
+  * Added support for providing custom proxy headers to pass on to Gunicorn
+    server.
+
+Bug-fixes:
+
+* ``php_website`` role
+
+  * Make sure the environment indicator is always shown on top by increasing its
+    ``z-index`` value.
+
+* ``wsgi_website`` role
+
+  * Make sure the environment indicator is always shown on top by increasing its
+    ``z-index`` value.
+
+
 1.1.0
 -----
 
diff --git a/docs/usage.rst b/docs/usage.rst
index e82119b9dee29cd819c65365748e3fdcd6517c9b..4e8bf44fab991ef0cc3f95ed54da2596ec5cece9 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -145,7 +145,7 @@ Ansible Roles:
 2. Checkout the correct version of the roles::
 
      cd ~/majic-ansible-roles/
-     git checkout -b 1.1.0 1.1.0
+     git checkout -b 1.2.0 1.2.0
 
 
 Preparing the basic site configuration
diff --git a/roles/web_server/files/nginx_verify_site.sh b/roles/web_server/files/nginx_verify_site.sh
index ed946af876511030871f47c02cf96d74e3f032f7..7b69223a2ebcc471f74a1880b183f7c078516886 100755
--- a/roles/web_server/files/nginx_verify_site.sh
+++ b/roles/web_server/files/nginx_verify_site.sh
@@ -2,7 +2,7 @@
 #
 # nginx_verify_site.sh
 #
-# Copyright (C) 2015, Branko Majic <branko@majic.rs>
+# Copyright (C) 2016, Branko Majic <branko@majic.rs>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@ function version() {
 $program, version $version
 
 +-----------------------------------------------------------------------+
-| Copyright (C) 2015, Branko Majic <branko@majic.rs>                    |
+| Copyright (C) 2016, Branko Majic <branko@majic.rs>                    |
 |                                                                       |
 | This program is free software: you can redistribute it and/or modify  |
 | it under the terms of the GNU General Public License as published by  |
@@ -180,4 +180,4 @@ rm -f "$temp_config/nginx/sites-enabled/$name"
 cp "$site_configuration_file" "$temp_config/nginx/sites-enabled/$name"
 
 # Finally, run the test.
-nginx -t -c "$temp_config/nginx/nginx.conf"
\ No newline at end of file
+nginx -t -c "$temp_config/nginx/nginx.conf"