26 Commits (987b1c2c36d69fba70ebc6e5077403d832f2d288)

Author	SHA1	Message	Date
ibuler	26804b4093	Merge pull request #174 from jumpserver/dev ... Release 0.3.1 version, Fix most bugs	2016-03-29 11:33:05 +08:00
wangyong	231f961945	fix asset upload bug	2016-03-23 11:56:32 +08:00
wangyong	a1e947ae1e	fix asset upload bug	2016-03-22 17:32:43 +08:00
yumaojun	cdd31227b7	fix (jasset): 　修复连接超时，以及freebsd无法更新硬件信息 ... 1. 超时原因应该是sshd　的配置引起的，当前bsd的更新　相对于其他发行版　慢，这个原因估计的bsd自身有关 2. ansible 的setup模块对于b sd获取的字段　越有偏差，而且无法获取硬盘信息，这个后期可以　提交patch 给ansible的setup模块。 close #80	2016-03-14 22:47:33 +08:00
wangyong	4fbeb5c172	fix cpu bug	2016-01-07 19:19:05 +08:00
wangyong	c2818870d3	fix aliyun disk bug	2016-01-04 16:37:02 +08:00
wangyong	cf59ebf1aa	fix asset add batch bug	2015-12-19 22:49:39 +08:00
ibuler	bd2a3e6119	bugfix	2015-12-08 11:32:27 +08:00
wangyong	e78d7b0219	cu asset page and sth	2015-12-06 23:48:39 +08:00
wangyong	2f0e91a538	fix bug	2015-12-05 16:57:47 +08:00
wangyong	2c3e681942	fix bugs	2015-12-05 16:15:19 +08:00
halcyon	f6dbec1436	day update	2015-12-02 23:39:17 +08:00
halcyon	dd912e8958	asset list and add system_arch	2015-12-01 23:39:49 +08:00
halcyon	09dcdfa318	fix some bugs and hehe	2015-11-26 23:42:58 +08:00
wangyong	5a3c11f619	asset update batch and crontab	2015-11-22 23:53:25 +08:00
wangyong	d25e23623a	fix bugs	2015-11-22 18:57:47 +08:00
wangyong	652ea98a2b	alert ip -> hostname	2015-11-21 18:28:25 +08:00
halcyon	f9b1d3059a	fix bugs	2015-11-19 21:58:44 +08:00
halcyon	d42197db3a	fix tower bugs	2015-11-17 23:34:13 +08:00
wangyong	0f29745bfa	asset add batch	2015-11-14 23:09:13 +08:00
root	3d6d714495	asset alert history	2015-11-10 00:11:54 +08:00
halcyon	e77ec102d9	just do it	2015-11-08 22:39:30 +08:00
root	159398b391	fix bugs	2015-11-03 23:53:12 +08:00
wangyong	0c0f05b6d9	jasset base	2015-11-03 17:07:46 +08:00
ibuler	907c2c7e97	资产修改基本完成	2015-09-10 22:51:42 +08:00
ibuler	960e45d0fa	添加asset_api	2015-09-09 00:19:36 +08:00