hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'blr' into release-1.0GA

Browse Source 
Conflicts:
	server/core/service.c
This commit is contained in:
Mark Riddoch
2014-12-16 15:44:19 +00:00
parent 8f570082eb 203e83d508
commit a655e394ac
10 changed files with 461 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/include/service.h
View File

@ -144,6 +144,8 @@ typedef enum count_spec_t {COUNT_NONE=0, COUNT_ATLEAST, COUNT_EXACT, COUNT_ATMOS
#define SERVICE_STATE_ALLOC 1 /**< The service has been allocated */
#define SERVICE_STATE_STARTED 2 /**< The service has been started */
#define SERVICE_STATE_FAILED 3 /**< The service failed to start */
#define SERVICE_STATE_STOPPED 4 /**< The service has been stopped */
extern SERVICE *service_alloc(const char *, const char *);
extern int service_free(SERVICE *);