From 1d9f409b46174cba48f79b8d5c534d5d09378fc1 Mon Sep 17 00:00:00 2001
From: andreamanzi <andrea.manzi@gmail.com>
Date: Mar 14 2017 10:26:12 +0000
Subject: Merge branch 'master' into el6


---

diff --git a/.gitignore b/.gitignore
index ea72fad..b3d4763 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /dynafed-1.2.2.tar.gz
 /dynafed-1.2.3.tar.gz
 /dynafed-1.2.4.tar.gz
+/dynafed-1.2.5.tar.gz
diff --git a/dynafed.spec b/dynafed.spec
index 2640666..2e61d98 100644
--- a/dynafed.spec
+++ b/dynafed.spec
@@ -11,7 +11,7 @@
 %endif
 
 Name:				dynafed
-Version:			1.2.4
+Version:			1.2.5
 Release:			1%{?dist}
 Summary:			Ultra-scalable dynamic system for federating HTTP-based storage resources
 Group:				Applications/Internet
@@ -210,6 +210,9 @@ make DESTDIR=%{buildroot} install
 /var/www/html/dashboard/*
 
 %changelog
+* Tue Mar 14 2017 Andrea Manzi <amanzi at cern.ch> - 1.2.5-1
+ - new bug fix release
+
 * Tue Feb 21 2017 Andrea Manzi <amanzi at cern.ch> - 1.2.4-1
  - new bug fix release
 
diff --git a/sources b/sources
index 5d1d2b9..6fb75b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dynafed-1.2.4.tar.gz) = e598569e66a0dfb927feb46213629636377d76673ced85c6f7a8faec3f3e320e86260662eb163e23b1510e5b3125e4a0942e64fc7118b24b1c7c74ebd068a340
+SHA512 (dynafed-1.2.5.tar.gz) = e6836c8cf261c5b37e7788d07bbe8d33d034336b6f0997e98a393dfe8ef02f638d9ea99d7ce6ec0e65ebfc85be8a72b41fec90d64257d532a711b0f0d9eef87c