From 8bce89a6165ac0ae5c56ce92f788af0bc4569937 Mon Sep 17 00:00:00 2001
From: Jan-Piet Mens <jpmens@gmail.com>
Date: Tue, 11 Jun 2013 09:13:32 +0200
Subject: [PATCH 1/3] setup epoch time doesn't have tics on Python 2.6.4
 (Solaris).

---
 system/setup | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/setup b/system/setup
index 274fb469ee9..d627ba6e720 100644
--- a/system/setup
+++ b/system/setup
@@ -365,6 +365,8 @@ class Facts(object):
         self.facts['date_time']['minute'] = now.strftime('%M')
         self.facts['date_time']['second'] = now.strftime('%S')
         self.facts['date_time']['epoch'] = now.strftime('%s')
+        if self.facts['date_time']['epoch'][0] == '%':
+            self.facts['date_time']['epoch'] = str(int(time.time()))
         self.facts['date_time']['date'] = now.strftime('%Y-%m-%d')
         self.facts['date_time']['time'] = now.strftime('%H:%M:%S')
         self.facts['date_time']['iso8601_micro'] = now.utcnow().strftime("%Y-%m-%dT%H:%M:%S.%fZ")

From bc6416d202e886ea2ed9e0ccb492de5a9e44838c Mon Sep 17 00:00:00 2001
From: Lorin Hochstein <lorin@nimbisservices.com>
Date: Thu, 13 Jun 2013 14:01:32 -0400
Subject: [PATCH 2/3] Fix broken link in django_manage doc

---
 web_infrastructure/django_manage | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/web_infrastructure/django_manage b/web_infrastructure/django_manage
index c8f89ce9917..1bf2e5b3c53 100644
--- a/web_infrastructure/django_manage
+++ b/web_infrastructure/django_manage
@@ -71,7 +71,7 @@ options:
       - A space-delimited list of fixture file names to load in the database. B(Required) by the 'loaddata' command.
     required: false
 notes:
-   - U(http://www.virtualenv.org/, virtualenv) must be installed on the remote host if the virtualenv parameter is specified.
+   - I(virtualenv) (U(http://www.virtualenv.org)) must be installed on the remote host if the virtualenv parameter is specified.
    - This module will create a virtualenv if the virtualenv parameter is specified and a virtualenv does not already exist at the given location.
    - This module assumes English error messages for the 'createcachetable' command to detect table existence, unfortunately.
 requirements: [ "virtualenv", "django" ]
@@ -87,11 +87,11 @@ django_manage: command=loaddata app_path=$django_dir fixtures=$initial_data
 
 #Run syncdb on the application
 django_manage: >
-    command=syncdb 
-    app_path=$django_dir 
-    settings=$settings_app_name 
-    pythonpath=$settings_dir 
-    virtualenv=$virtualenv_dir 
+    command=syncdb
+    app_path=$django_dir
+    settings=$settings_app_name
+    pythonpath=$settings_dir
+    virtualenv=$virtualenv_dir
     database=$mydb
 
 #Run the SmokeTest test case from the main app. Useful for testing deploys.

From f8f9e7167d73e90f4721ee0372f96a8b265c926e Mon Sep 17 00:00:00 2001
From: Serge van Ginderachter <serge@vanginderachter.be>
Date: Fri, 14 Jun 2013 20:45:58 +0200
Subject: [PATCH 3/3] docfix on file module, aliases for path parameter

---
 files/file | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/file b/files/file
index ed957819eb4..85befb3415e 100644
--- a/files/file
+++ b/files/file
@@ -42,7 +42,7 @@ options:
       - defines the file being managed, unless when used with C(state=link), and then sets the destination to create a symbolic link to using I(src)
     required: true
     default: []
-    aliases: []
+    aliases: ['dest', 'name'] 
   state:
     description:
       - If C(directory), all immediate subdirectories will be created if they