Commit 8b5eb5ac authored by Scott Vokes's avatar Scott Vokes
Browse files

Merge branch 'develop_history_cleanup' into develop_mock_bus_syscalls

parents 92f7b40c a22ee560

Makefile

+3 −4
Original line number Diff line number Diff line
@@ -177,6 +177,8 @@ ci: stop_sims start_sims all stop_sims 
	@echo $(PROJECT) v$(VERSION) is in working order!

	@echo



apply_license:

	scripts/apply_license.sh



#-------------------------------------------------------------------------------

# json-c
@@ -225,14 +227,11 @@ JAVA_BIN = $(JAVA_HOME)/bin/java 


.PHONY: test



test_internals: test_threadpool test_bus

test_internals: test_threadpool



test_threadpool:

	cd ${LIB_DIR}/threadpool && make test



test_bus: test_threadpool ${OUT_DIR}/libsocket99.a ${OUT_DIR}/libthreadpool.a

	cd ${LIB_DIR}/bus && make test



#-------------------------------------------------------------------------------

# Internal Libraries

#-------------------------------------------------------------------------------

config/license_template

+2 −2
Original line number Diff line number Diff line 
/*

* kinetic-c-client

* Copyright (C) 2014 Seagate Technology.

* kinetic-c

* Copyright (C) 2015 Seagate Technology.

*

* This program is free software; you can redistribute it and/or

* modify it under the terms of the GNU General Public License

include/byte_array.h

+2 −2
Original line number Diff line number Diff line 
/*

* kinetic-c-client

* Copyright (C) 2014 Seagate Technology.

* kinetic-c

* Copyright (C) 2015 Seagate Technology.

*

* This program is free software; you can redistribute it and/or

* modify it under the terms of the GNU General Public License

include/kinetic_admin_client.h

+1 −1
Original line number Diff line number Diff line 
/*

* kinetic-c

* Copyright (C) 2014 Seagate Technology.

* Copyright (C) 2015 Seagate Technology.

*

* This program is free software; you can redistribute it and/or

* modify it under the terms of the GNU General Public License

include/kinetic_client.h

+1 −1
Original line number Diff line number Diff line 
/*

* kinetic-c

* Copyright (C) 2014 Seagate Technology.

* Copyright (C) 2015 Seagate Technology.

*

* This program is free software; you can redistribute it and/or

* modify it under the terms of the GNU General Public License