Merge pull request #37 from chenchongli/master (9b6043a5) · Commits · kinetic-archive / kinetic-cpp-client

.travis.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ install:
		- cmake .
		- make
		before_script:
		- git clone https://github.com/Seagate/kinetic-java
		- git clone https://github.com/Kinetic/kinetic-java
		- if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_home); fi
		- echo $JAVA_HOME
		- mvn -f ./kinetic-java/pom.xml -DskipTests clean package

+373 −502

File changed.

Preview size limit exceeded, changes collapsed.

+2 −2

Original line number	Diff line number	Diff line
		[![Build Status](https://travis-ci.org/Seagate/kinetic-cpp-client.svg?branch=master)](https://travis-ci.org/Seagate/kinetic-cpp-client)
		[![Build Status](https://travis-ci.org/Kinetic/kinetic-cpp-client.svg?branch=master)](https://travis-ci.org/Kinetic/kinetic-cpp-client)
		Introduction
		============
		This repo contains code for producing C and C++ kinetic clients. The C++ library currently does not support Windows at this time because of existing library requirements.
		@@ -6,7 +6,7 @@ This repo contains code for producing C and C++ kinetic clients. The C++ library

		Protocol Version
		=================
		The client is using version `3.0.0` of the [Kinetic-Protocol](https://github.com/Seagate/kinetic-protocol).
		The client is using version `3.0.0` of the [Kinetic-Protocol](https://github.com/Kinetic/kinetic-protocol).


		Dependencies

+12 −15

Original line number	Diff line number	Diff line
		/*
		* kinetic-cpp-client
		* Copyright (C) 2014 Seagate Technology.
		/**
		* Copyright 2013-2015 Seagate Technology LLC.
		*
		* 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 the Free Software Foundation; either version 2
		* of the License, or (at your option) any later version.
		* This Source Code Form is subject to the terms of the Mozilla
		* Public License, v. 2.0. If a copy of the MPL was not
		* distributed with this file, You can obtain one at
		* https://mozilla.org/MP:/2.0/.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		* but is provided AS-IS, WITHOUT ANY WARRANTY; including without
		* the implied warranty of MERCHANTABILITY, NON-INFRINGEMENT or
		* FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public
		* License for more details.
		*
		* See www.openkinetic.org for more project information
		*/

		#include <memory>

+12 −15

Original line number	Diff line number	Diff line
		/*
		* kinetic-cpp-client
		* Copyright (C) 2014 Seagate Technology.
		/**
		* Copyright 2013-2015 Seagate Technology LLC.
		*
		* 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 the Free Software Foundation; either version 2
		* of the License, or (at your option) any later version.
		* This Source Code Form is subject to the terms of the Mozilla
		* Public License, v. 2.0. If a copy of the MPL was not
		* distributed with this file, You can obtain one at
		* https://mozilla.org/MP:/2.0/.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		* but is provided AS-IS, WITHOUT ANY WARRANTY; including without
		* the implied warranty of MERCHANTABILITY, NON-INFRINGEMENT or
		* FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public
		* License for more details.
		*
		* See www.openkinetic.org for more project information
		*/

		#include <memory>