[maven-release-plugin] rollback changes from release preparation of 2.7-ndgf
rpm: Fix build of non-snapshot versions

Also converted - to ~, since RPM nowadays understands that symbol
(same semantics as for DEB, that is, it is lexicographically
smaller than the empty string).

Target: trunk
Require-notes: no
Require-book: no
Acked-by: Paul Millar <paul.millar@desy.de>
Patch: http://rb.dcache.org/r/6197/
gplazma: Avoid multiple primary FQANs

Addresses a bug that can cause multiple primary FQANs to be created,
thus resulting in failures in billing and spacemanager.

The vorolemap plugin may cause multiple primary FQANs to be created.
This results in SrmSpaceManager failures, eg:

06 Nov 2013 08:51:38 (SRM-gonzo) [130.235.149.204:59894 ZR0:11817:srm2:prepareToPut:-2060713576:-2060713574] Failed to mark space as being used space: Marking Space as Being Used failed
=>Subject has multiple primary FQANs

This is a regression introduced in dCache 2.6 when we altered the
gPlazma plugin interface. Before, only the FQAN for which we
generated a mapping was included as a primary FQAN.

In the fix I decided to only include the actual primary FQAN and
not add "fake" primary FQAN based on mappings that exist. This is
a change compared to pre-2.6 semantics, but I believe this is the
correct thing to do and is also more stable when multiple mapping
plugins are used.

Target: trunk
Request: 2.6
Require-book: no
Require-notes: yes
Acked-by: Paul Millar <paul.millar@desy.de>
Patch: http://rb.dcache.org/r/6198/
gplazma: Fix unit tests for vorolemap plugin

Target: trunk
Require-notes: no
Require-book: no
Request: 2.6
Acked-by: Karsten Schwank <karsten.schwank@desy.de>
Patch: http://rb.dcache.org/r/6202/
Make RPM build SL compatible

Seems the world is full of old software. SL 6.2 uses an RPM too
old for proper version numbers.

Target: trunk
Require-notes: no
Require-book: no
Acked-by: Paul Millar <paul.millar@desy.de>
Patch: http://rb.dcache.org/r/6203/
srm: Reformat Scheduler

Target: trunk
Require-book: no
Require-notes: no
ssh2: add options to control idle connection lifetime

added two new options:

admin.ssh.idle-timeout =
admin.ssh.idle-timeout.unit =

to tell ssh how lond to keep idle connection

Acked-by: Albert Rossi
Acked-by: Paul Millar
Acked-by: Dmitry Litvintsev
Target: master
Require-book: yes
Require-notes: yes
libs: switch to jpnfs-0.6.1

Changelog for jpnfs-0.5.8..nfs4j-0.6.1
    * [3e3532d] src: rename package org.dcache.chimera.nfs to org.dcache.nfs
    * [f8ec52f] nfs: ExportFile returns Iterable instead of Collection
    * [3825d6a] pom: java7 is allowed
    * [c1f4711] src: towards java7: use diamond operator
    * [3b68d7f] src: towards java7: use try-with-resources
    * [4aa0cd0] src: towards java7: use muticatch
    * [2e90166] nfsv4: bitmap should implement Iterable interface
    * [db9f154] nfsv4: consult export file on getRootInode()
    * [e40f159] change version number schema to M.m.p
    * [38c61df] test: add unit test for FileHandle and FileHandleBuilder
    * [c79fa4d] vfs: construct new file handles from old one
    * [9b08969] vfs: support old file handles
    * [483f7c7] client: add lookup by fh
    * [bae75e1] pom: scm should point to dCache's github repository
    * [5b448bc] nfsv41: propagate layout return errors on close
    * [9cf5505] nfsv41: consult backend 'filesystem' for read/write access
    * [7969395] nfsv41: rename NFS4Client#sessionsEmpty() to NFS4Client#hasSessions().
    * [86e9cad] nfs: added support for sec flavor in export file
    * [c928dae] vfs: check security flavor used by client
    * [30ee45f] nfs: ignore and log export entries with unsupported options
    * [bb7d28f] nfsv3: reply correct auth flavor of mount
    * [2610307] junit: refactor v4 test to reduce code duplication
    * [302c210] nfsv41: fix open stateid leak
    * [f9d6c2c] nfsv41: garbage-collect expired sessions
    * [3e76f8e] nfs: FsExport takes  builder in the constructor
    * [fd2848f] exports: added support for all_squash option
    * [a09c9c9] pseudofs: respect all_squash option
    * [6bcdd84] exports: fix broken commit
    * [623c675] exports: added support fot anonuid/anongid
    * [5510940] exports: improve toString()
    * [ea6ec12] pom: update slf4j and logback libraries
    * [2fb54ef] logging: update to use varargs
    * [f1bc992] nfs: fix readdir caching
    * [a61bdf3] nfsv: fix operation position check
    * [48011ed] pom: switch to oncrpc4j-2.1.0
    * [95443ce] utils: make guava Cache JMX aware
    * [ecf6a9f] utils: fix leftovers from jul to slf4j migration
    * [f7fdc97] src: reorganise project into multi module maven project
    * [a51eb1a] core: limit number of states owned by cliet
    * [60dc0f3] nfs: use Cache#get to populate READDIR cache
    * [2e6e17c] vfs: use inodeToBytes to generate file handle for chimera
    * [03357e6] vfs: update API interface to match new changes in chimera

update corresponding code

Acked-by: Paul Millar
Target: master
Require-book: no
Require-notes: no
Fix dCache version to 2.7.0-SNAPSHOT
spacemanager: Fix setter for cleanupExpiredSpaceFiles property

The wonders of static analysis....

Target: trunk
Require-notes: no
Require-book: no
Request: 2.7
Acked-by: Dmitry Litvintsev <litvinse@fnal.gov>
Patch: http://rb.dcache.org/r/6213/
(cherry picked from commit 7e448d0197a971f3619008fbd98e185009174dcc)
srmspacemanager: catch and ignore SQL exception on error handling path when processing PoolMgrSelectWritePool on reply from PoolManager

In the previous version of selectPool the srmspace file has always been
defined (even if id had no pnfsid associdated). Recent changes introduced
better separation of handling messages to PoolManager and from PoolManager.
In case of reply only error handling part is needed (nullify pnfsid of
srmspacefile record).

Ticket: 8087
Acked-by:
Request: 2.7
Require-book: no
Require-notes: no
Merge pull request #265 from gbehrmann/fix/2.7/rb6213

spacemanager: Fix setter for cleanupExpiredSpaceFiles property
Merge pull request #266 from DmitryLitvintsev/2.7

srmspacemanager: catch and ignore SQL exception on error handling path w...
Merge commit '97ee57b29a109043587a7007ecc4cbc71466b7cd' into 2.7-ndgf
Merge commit '71514a415aba0df58bc0f57336cb27cd841b4d72' into 2.7-ndgf
Merge commit '1203f40e4c835f34936a761bd664ade3af947641' into 2.7-ndgf
Merge branch '2.7' into 2.7-ndgf
[maven-release-plugin] prepare release 2.7.0-ndgf2
[maven-release-plugin] prepare for next development iteration