Merge branch 'master' into web
Conflicts: webservice/DataSID.java webservice/collected-data.xsd webservice/net-collected-data.xsd
No related branches found
No related tags found
Showing
- agent/Makefile.in 33 additions, 3 deletionsagent/Makefile.in
- agent/bin/datasid-agent.sh 2 additions, 2 deletionsagent/bin/datasid-agent.sh
- agent/bin/datasid-common.sh 5 additions, 5 deletionsagent/bin/datasid-common.sh
- agent/bin/datasid-netmon.sh 1 addition, 6 deletionsagent/bin/datasid-netmon.sh
- agent/bootstrap/install 6 additions, 22 deletionsagent/bootstrap/install
- agent/bootstrap/update 0 additions, 20 deletionsagent/bootstrap/update
- agent/conf/datasid.conf 1 addition, 1 deletionagent/conf/datasid.conf
- agent/gen-scripts/collected-data/agent-version.tree 1 addition, 1 deletionagent/gen-scripts/collected-data/agent-version.tree
- agent/gen-scripts/collected-data/inventory/distro.tree 5 additions, 2 deletionsagent/gen-scripts/collected-data/inventory/distro.tree
- agent/gen-scripts/collected-data/telecentro-info.tree 2 additions, 13 deletionsagent/gen-scripts/collected-data/telecentro-info.tree
- agent/gen-scripts/collected-data/user-history.tree 1 addition, 1 deletionagent/gen-scripts/collected-data/user-history.tree
- agent/network-scripts/net-collected-data/agent-version.tree 1 addition, 1 deletionagent/network-scripts/net-collected-data/agent-version.tree
- agent/network-scripts/net-collected-data/bandwidth-usage.tree 6 additions, 1 deletion...t/network-scripts/net-collected-data/bandwidth-usage.tree
- agent/network-scripts/net-collected-data/telecentro-id.tree 1 addition, 1 deletionagent/network-scripts/net-collected-data/telecentro-id.tree
- webservice/DataSID.java 76 additions, 74 deletionswebservice/DataSID.java
- webservice/collected-data.xsd 2 additions, 2 deletionswebservice/collected-data.xsd
- webservice/net-collected-data.xsd 1 addition, 1 deletionwebservice/net-collected-data.xsd
Loading
Please register or sign in to comment